From: Jeroen van der Heijden Date: Wed, 19 Jan 2022 12:36:13 +0000 (+0100) Subject: Increased chunk size X-Git-Tag: archive/raspbian/2.0.48-1+rpi1^2~6^2^2~20 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9a82a06c8b69c893e404ce92bf465c96cfeffb7e;p=siridb-server.git Increased chunk size --- diff --git a/include/siri/db/shard.h b/include/siri/db/shard.h index 97e38dab..7bc65950 100644 --- a/include/siri/db/shard.h +++ b/include/siri/db/shard.h @@ -47,7 +47,6 @@ siridb_shard_t * siridb_shard_create( uint8_t tp, siridb_shard_t * replacing); uint64_t siridb_shard_duration_from_interval(siridb_t * siridb, uint64_t interval); -uint64_t siridb_shard_interval_from_duration(uint64_t duration); int siridb_shard_cexpr_cb( siridb_shard_view_t * vshard, cexpr_condition_t * cond); diff --git a/include/siri/version.h b/include/siri/version.h index 7915f2cf..3e8d3e30 100644 --- a/include/siri/version.h +++ b/include/siri/version.h @@ -6,7 +6,7 @@ #define SIRIDB_VERSION_MAJOR 2 #define SIRIDB_VERSION_MINOR 0 -#define SIRIDB_VERSION_PATCH 45 +#define SIRIDB_VERSION_PATCH 46 /* * Use SIRIDB_VERSION_PRE_RELEASE for alpha release versions. @@ -15,7 +15,7 @@ * Note that debian alpha packages should use versions like this: * 2.0.34-0alpha0 */ -#define SIRIDB_VERSION_PRE_RELEASE "" +#define SIRIDB_VERSION_PRE_RELEASE "-alpha-0" #ifndef NDEBUG #define SIRIDB_VERSION_BUILD_RELEASE "+debug" diff --git a/src/siri/db/shard.c b/src/siri/db/shard.c index fc1dbd2c..d2e7b937 100644 --- a/src/siri/db/shard.c +++ b/src/siri/db/shard.c @@ -87,7 +87,7 @@ * * Max 65535 since uint16_t is used to store this value */ -#define DEFAULT_MAX_CHUNK_SZ_NUM 800 +#define DEFAULT_MAX_CHUNK_SZ_NUM 1200 #define DEFAULT_MAX_CHUNK_SZ_LOG 128 static const siridb_shard_flags_repr_t flags_map[SHARD_STATUS_SIZE] = { @@ -168,11 +168,6 @@ uint64_t siridb_shard_duration_from_interval(siridb_t * siridb, uint64_t interva return (x + 1) * hour; } -uint64_t siridb_shard_interval_from_duration(uint64_t duration) -{ - return duration / OPTIMAL_POINTS_PER_SHARD;; -} - int siridb_shard_migrate( siridb_t * siridb, uint64_t shard_id,